[prometheus-redis-exporter] render ServiceMonitor regardless of the monitoring CRD present #6096
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Akshay Rohatgi <[email protected]>
zanhsieh
requested changes
Aug 31, 2025
Comment on lines
+1
to
2
| {{- if .Values.serviceMonitor.enabled }} | ||
| apiVersion: {{ .Values.serviceMonitor.apiVersion | default "monitoring.coreos.com/v1" }} |
There was a problem hiding this comment.
Did you ever try this?
Suggested change
| {{- if .Values.serviceMonitor.enabled }} | |
| apiVersion: {{ .Values.serviceMonitor.apiVersion | default "monitoring.coreos.com/v1" }} | |
| {{- $monitorApiVersion := .Values.serviceMonitor.apiVersion | default "monitoring.coreos.com/v1" }} | |
| {{- if and ( .Capabilities.APIVersions.Has $monitorApiVersion ) ( .Values.serviceMonitor.enabled ) }} | |
| apiVersion: {{ $monitorApiVersion }} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
The ServiceMonitor template would only render and install for monitoring.coreos.com only. On AKS Managed Prometheus clusters that ship only azmonitoring.coreos.com, Helm skips rendering the ServiceMonitor even with serviceMonitor.enabled being set to true and an apiVersion override.
This change is an approach to gating the template that is consistent with other exporters within this repository.
Which issue this PR fixes
Special notes for your reviewer
Checklist
[prometheus-couchdb-exporter])